From 6a249a118ef215d6eff4c4fec81a69298365a914 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Thu, 13 Aug 2015 11:09:38 +0100 Subject: [PATCH] xl: close restore file fd when we're done with it And log if close fails. Reported-by: Andrew Armenia Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 499a05ce87..c6b0b68276 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2627,6 +2627,7 @@ static uint32_t create_domain(struct domain_create *dom_info) void *config_data = 0; int config_len = 0; int restore_fd = -1; + int restore_fd_to_close = -1; const libxl_asyncprogress_how *autoconnect_console_how; struct save_file_header hdr; @@ -2650,6 +2651,7 @@ static uint32_t create_domain(struct domain_create *dom_info) fprintf(stderr, "Can't open restore file: %s\n", strerror(errno)); return ERROR_INVAL; } + restore_fd_to_close = restore_fd; rc = libxl_fd_set_cloexec(ctx, restore_fd, 1); if (rc) return rc; } @@ -2851,6 +2853,13 @@ start: release_lock(); + if (restore_fd_to_close >= 0) { + if (close(restore_fd_to_close)) + fprintf(stderr, "Failed to close restoring file, fd %d, errno %d\n", + restore_fd_to_close, errno); + restore_fd_to_close = -1; + } + if (!paused) libxl_domain_unpause(ctx, domid); -- 2.30.2